fixed build of extensions

diff --git a/ChangeLog b/ChangeLog
index def55c708f01528aea2cb6e3616b99cfbebfe7ee..7f8f2be9820e91b418aa6c756b0c225a26f2108a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,9 @@
 
        * Makefile.am,
        * babl.pc.in,
-       * extensions/Makefile.in: Fixed build of extensions.
+       * configure.ac,
+       * extensions/Makefile.in: Fixed build of extensions. (awaiting
+       fix of babl/babl-extension.c to use new #defines)
 
 2005-08-30  Øyvind Kolås  <pippin@gimp.org>
 

diff --git a/Makefile.am b/Makefile.am
index 8cfe7e278e5a89a98c07ebc37c4b6258d2bdbf9e..4c3528d4f9ad5bb7c0d839086ff75067fd31305d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign dist-bzip2
 
 SUBDIRS = babl \
          tests \

diff --git a/babl.pc.in b/babl.pc.in
index 4b995f3b167e16cc4aca8e265de98630f566e184..3922ced44e282e24118e42341e1293d5609b50aa 100644 (file)
--- a/babl.pc.in
+++ b/babl.pc.in
@@ -7,5 +7,5 @@ Name: babl
 Description: Dynamic; any to any, pixel format conversion library
 Version: @VERSION@
 Libs: -L${libdir} -lbabl -ldl
-Cflags: -I${includedir}/babl-0.0/babl
+Cflags: -I${includedir}/@PACKAGE_NAME@-@BABL_API_VERSION@/@PACKAGE_NAME@
 

diff --git a/configure.ac b/configure.ac
index 7000c06b7fa1e3a3743e7a719ffbf4e3d12238d8..e0e3b392df0ef8f682ecccee89ead38326a28788 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,27 +1,35 @@
-AC_INIT(babl/babl.h)
-AM_CONFIG_HEADER(config.h)
+AC_PREREQ(2.54)
 
-BABL_MAJOR_VERSION=0
-BABL_MINOR_VERSION=0
-BABL_MICRO_VERSION=1
+m4_define([babl_major_version], 0)
+m4_define([babl_minor_version], 0)
+m4_define([babl_micro_version], 2)
 
-BABL_API_VERSION=0.0
+AC_INIT(babl, babl_major_version.babl_minor_version.babl_micro_version)
+AC_CONFIG_SRCDIR(babl/babl.h)
+AC_CONFIG_HEADERS(config.h)
+
+BABL_MAJOR_VERSION=babl_major_version
+BABL_MINOR_VERSION=babl_minor_version
+BABL_MICRO_VERSION=babl_micro_version
+BABL_REAL_VERSION=babl_real_version
+BABL_VERSION=babl_version
+
+BABL_API_VERSION=babl_major_version.babl_minor_version
 AC_SUBST(BABL_API_VERSION)
 
 BABL_LIBRARY_VERSION=0:0:0
 
 AC_SUBST(BABL_LIBRARY_VERSION)
 
-PACKAGE=babl
+PACKAGE_NAME=babl
+AC_SUBST(PACKAGE_NAME)
 
 BABL_VERSION=$BABL_MAJOR_VERSION.$BABL_MINOR_VERSION.$BABL_MICRO_VERSION
 BABL_RELEASE=$BABL_MAJOR_VERSION.$BABL_MINOR_VERSION
 AC_SUBST(BABL_RELEASE)
 AC_SUBST(BABL_VERSION)
 
-VERSION=$BABL_VERSION
-
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
+AM_INIT_AUTOMAKE(no-define)
 
 AC_PROG_CC
 AM_PROG_LIBTOOL
@@ -35,12 +43,24 @@ if eval "test x$GCC = xyes"; then
   esac
 fi
 
+babl_extension_dir="$(libdir)/babl"
+AC_SUBST(babl_extension_dir)
+
 AC_PATH_PROG(INKSCAPE, inkscape, no)
 AM_CONDITIONAL(HAVE_INKSCAPE, test "x$INKSCAPE" != "xno")
 
 AC_PATH_PROG(W3M, w3m, no)
 AM_CONDITIONAL(HAVE_W3M, test "x$W3M" != "xno")
 
+dnl ===========================================================================
+
+AC_DEFINE_UNQUOTED(BABL_PATH, "~/.babl-$BABL_API_VERSION:/usr/local/lib/babl-$BABL_API_VERSION:/usr/lib/babl-$BABL_API_VERSION", [search path for babl extensions (default value of enviroment variable)])
+AC_DEFINE(BABL_PATH_SEPERATOR, "/", [string used to seperate directories in a path string]) 
+AC_DEFINE(BABL_LIST_SEPERATOR, ':', [seperator between paths in BABL_PATH])
+
+dnl ===========================================================================
+
+
 dnl ===========================================================================
 
 AC_CONFIG_FILES(

diff --git a/extensions/Makefile.in b/extensions/Makefile.in
index cb4bb42380f1b0a102fc75f7f96bf584ff3b1714..3e807579caaa36a1096068b67e3b1170e1f51a15 100644 (file)
--- a/extensions/Makefile.in
+++ b/extensions/Makefile.in
@@ -1,10 +1,14 @@
 # General minimalistic compile file for self contained single
 # file babl_extensions
 
+CC = @CC@
+
 CFILES  = $(wildcard *.c)
+CFLAGS  = @CFLAGS@
 SOBJS   = $(CFILES:.c=.so)
 all: $(SOBJS)
 
+CFLAGS  += -Wall
 
 %.so: %.c
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
@@ -19,22 +23,16 @@ CIE-Lab.so: CIE-Lab.c
 
 
 
-
-#############################################################################
 #############################################################################
-CFLAGS  = -O2 -Wall
 LDFLAGS = -shared -lc
 
 CFLAGS  += -I../babl
-#`pkg-config babl --cflags`
-#LDFLAGS += `pkg-config babl --libs`
-
 
 clean:
-       rm -f *.so
+       rm -f $(SOBJS)
 distclean:
-       rm -f *.so Makefile
-maintainerclean: distclean
+       rm -f $(SOBJS) Makefile
+maintainer-clean: distclean
 mostlyclean:
 
 subdir       = extensions
@@ -42,13 +40,18 @@ srcdir       = @srcdir@
 top_builddir = ..
 INSTALL      = @INSTALL@
 SHELL        = @SHELL@
+ext_dir      = @prefix@@libdir@/babl-@BABL_API_VERSION@
 
 install: user-install
-       #FIXME: need a proper install target as well
 
 user-install: all
-       $(INSTALL) -d /home/pippin/.babl
-       $(INSTALL) $(SOBJS)  /home/pippin/.babl
+       $(INSTALL) -d $(ext_dir)
+       $(INSTALL) $(SOBJS)  $(ext_dir)
+distdir:
+       cp $(CFILES) $(Makefile.in) $$distdir
+
+dvi:
+       #playing along with automake
 
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status